From 5d7d5eedd5354171e28326bdea95fc9978d1f627 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 16 Oct 2001 23:28:45 +0000 Subject: [PATCH] Rename ACTIVATE_MNEMONIC enum to MNEMONIC_ACTIVATE; signal was changed a Tue Oct 16 17:04:44 2001 Owen Taylor * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to MNEMONIC_ACTIVATE; signal was changed a long time ago. * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): Fix wrong return statement. (Reported by HideToshi Tajima and others.) * gtk/gtklabel.h (struct _GtkLabelClass): Remove left over select_all vfunc. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ gdk/x11/gdkim-x11.c | 2 +- gtk/gtklabel.h | 1 - gtk/gtkwidget.c | 6 +++--- 10 files changed, 95 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 072e49aa66..69e9eed9d7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Tue Oct 16 17:04:44 2001 Owen Taylor + + * gtk/gtkwidget.c: Rename ACTIVATE_MNEMONIC enum to + MNEMONIC_ACTIVATE; signal was changed a long time + ago. + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): + Fix wrong return statement. (Reported by HideToshi + Tajima and others.) + + * gtk/gtklabel.h (struct _GtkLabelClass): Remove + left over select_all vfunc. + Tue Oct 16 15:50:03 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_translate_coordinates): Add diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index bd118b0aa0..fbf2ac49bf 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -94,7 +94,7 @@ _gdk_x11_initialize_locale (void) g_message ("%s multi-byte string functions.", gdk_use_mb ? "Using" : "Not using")); - return current_locale; + return; } gchar* diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 149a3cbffb..9c863a4810 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -84,7 +84,6 @@ struct _GtkLabelClass gint count, gboolean extend_selection); void (* copy_clipboard) (GtkLabel *label); - void (* select_all) (GtkLabel *label); /* Hook to customize right-click popup for selectable labels */ void (* populate_popup) (GtkLabel *label, diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 882bd57f34..78082201b8 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -71,7 +71,7 @@ enum { CHILD_NOTIFY, ADD_ACCELERATOR, REMOVE_ACCELERATOR, - ACTIVATE_MNEMONIC, + MNEMONIC_ACTIVATE, GRAB_FOCUS, FOCUS, EVENT, @@ -623,7 +623,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) widget_signals[REMOVE_ACCELERATOR] = gtk_accel_group_create_remove (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST, GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator)); - widget_signals[ACTIVATE_MNEMONIC] = + widget_signals[MNEMONIC_ACTIVATE] = g_signal_new ("mnemonic_activate", GTK_CLASS_TYPE (object_class), GTK_RUN_LAST, @@ -2652,7 +2652,7 @@ gtk_widget_mnemonic_activate (GtkWidget *widget, handled = TRUE; else gtk_signal_emit (GTK_OBJECT (widget), - widget_signals[ACTIVATE_MNEMONIC], + widget_signals[MNEMONIC_ACTIVATE], group_cycling, &handled); return handled; -- 2.30.2